cleaned up code, fixed error with sizeof array
Merge pull request #22 from NickOttrando/nick

cleaned up code, fixed error with sizeof array