Fix PSR-2 violations in Project Model and Build Service