Fixed some copy-pasted comments
Reordered imports