Cleaning up initial commit