Codestyle Pass 3