more code cleanups, using sublime TrailingSpaces which highlights and helps remove all whitespaces