Correct Errors

Change PSR-1 naming error
Change executable file
Clean up code