some formatting and reorganizing