Use const where possible
Better indents