Fixed code arrangement based on PHPCS report