Cleanup (indentation, comments)