structuring, styling, cleanup