Updating init functions
Starting to refactor renderer