Changes to follow PSR-2 and documentation cleanup