Refactor into multiple classes
Remove extraneous imports