Feature/comment and phpcs