Fixed coding styles and docblocks