remove emtpy helpers
remove trailing whitespace