Cleaned up some code and added comments