Closes #6 -- Cleanup, some psr-1 changes, newlines, etc