Improve indentation or something