Cleaning Helpers

Cleaning Helpers