James C - whitespaceing everywhere (its own commit for sanity)
James C - consts, types, and vars