Further organization and hoisting