Moved text rendering to new Text class and cleaned