Making it look nicer