Some more prettification