Removed commented code, added text comments for doxygen