Adding doxygen support and cleanup comments