Second Commit
Cleanup