Fix indentation & PSR stuff