Refactor

![http://i.imgur.com/Pr502xJ.gif](http://i.imgur.com/Pr502xJ.gif)

wasn't Enterprise Web 2.0 Scale Function Oriented enough