Better ordering/weird indent?