Code cleanup, blank line stripping