Several code style changes (PSR-2)