Organize imports, added some comments