Cleaning code, moved renderer code over to renderer.