reorder assignments to include more OOP

/cc @advanced-js/summer-2014