Refactors

Just some ideas, got interested from this comment, and kinda went too far:

http://github.com/mojombo/proxymachine/commit/a2c79ff2625b78e853f58f42543f510bb589ca15#comments

Anyway, see what you think.