Nii - correcting project structure so source code is separate from test code
Nii - refactored to use for loop instead of while loop and inlined declaration of variables only used inside of for loop to improve readability and make code more concise. This was done because I felt I may have prematurely optimized for performance
Nii - refactored constants out to the class level and made them static since only one copy is needed