Make things nicer