Fix PSR-2 violation in Build Service