Nicer code, idented