Refact render