More cleaning up, styling, indentation, etc