Making it nicer :)