cleaned up classes, working on cancelling div