Adding missing doc blocks
Cleaning up syntax