Cleans up imports, minor code warnings