Cleaned-up
Initial commit.