PSR2 conventions and updating documentation