Update spelling, make code more readable, update helpers