Code clean-up conform PHP-fig