Making it a little prettier and faster.