Clean up doc blocks, strip lines not needed and some minor refactoring