Move docblocks inside conditionals and reformat