Codestyle Pass 2