Made the core of the application more legible.