New indentation and docblocks fixing