QA, cosmetics, removed unnecessary imports, corrected integer kind