Fixed 2 errors I've introduced, also code style and doxygen work