Fixed indentation and docblocks