Organize code + Improve indentation