Made things nicer :P