Cleanup indentation and update comments.