cleaned up with phpcs