Bug fix
Updated to fix phpcs issues
A few updates to make it look nicer