Improve code indenting & others