Clean up, less PHP, less echos
Merge pull request #213 from supimfuzzy/patch-1

Clean up, less PHP, less echos