removed unused helper functions
remove whitespace