Added comments, PSR code style