cleaned up code
Merge branch 'development' of https://github.com/kcelestine/froogalr into development