Cleanup

 - cleanup comments
 - standardize syntax
 - remove extraneous whitespace
 - ensure EOF empty line
 - remove imports from the public API if only needed locally