Simplified code, making things easier to read.

Everything is simpler and easier to read.