Cleaned up some code for pre-release