First step of refactoring.

Making things easier to read.