Cleanup in helper methods
Cleaning up some off-by-one fixes
Debug printStackTrace() removed