Normalized indenting and fixed phpcs errors