Further prettification