styling, indentation, cleanup