Fixed code style to obey PSR2