Some cleanup and making things a bit more customizable.