cleanup
settings fixed
cleaning up no console errors
Merge pull request #1 from JNazare/cleanup

Cleanup