moving stuff around & prettifying (?)