Removed commented code
Fixed copyright messages
removed unused parameters
Added doxygen comments