Final commit, made code easier to read.