Initial commit.
Small cleanup