Organized imports by system, libs and local
Minor typos in comments