Updating docblocks
Fixing code formatting