cleaned up scaffold