clean up indentation, spacing, code conventions