Tidying up render methods