cleaned up drawing and input