Follow PSR-2 codestyle
(c), (r) and (tm) feature remove