Updating formating to kohana and PSR2 standardse