little cleanups, thanks hlint