Rearrange imports and fix comments

Signed-off-by: Steven Downer <grinch@outlook.com>