Add Doc Blocks and fix formatting