Cleaned up some code and imports