remove empty helpers
remove trailing whitespaces