Cleaned up some files that were littering up my workspace
Finishing up refactor