Cleaned source code

This is a clean of the source code to respect PSR standards. Tests are still passing.