Making it neater