Enhancement #100

Fix phpcs errors and reformat function