General Cleanup

This pull request contains a general cleanup of the initial work.