Minor cleanup in rendering