Cleaner initial commit.