polishing a bit, observing phpcs rules