Cleaned up some code and fixed small bug introduced by recent commit
Merge branch 'master' of github.com:mariposacoop/IS4C