formatting / cleanliness updates