Abstraction and modularization with the help of natec425.

Also known as "I'm making it look better."