Removed commented sections. Cleaned up some code
Merged from master