Cleaned up source code and did code inspection on all with PHPStorm