more refactoring on rendering