Cleanup code and imports (again :P)