cleaned up scaffold base