Adjusted some coding style issues to respect PSR-2