Cleaned up doc blocks and whitespace