Removed commented sections. Cleaned up some code