Refactor initial render structure