Made changes requested in pull request. Mostly code style and doxygen stuff