Cleaning up and introducing some new defaults