Code cleanup, no functional changes.
first commit.