further rendering code simplifications