more code imports & cleanup