Fixed imports and comments
Fixed: comments now follow guidelines