Code comments & PSR updates