Nicer code?