cleaned up fragments from refactor