reorging
finished de-haml-fy-ing and general re-org