Changed some code style to match PSR standard