Imports organized and comment modified.

Signed-off-by: Sanjay Madnani <http://sanjaymadnani.wordpress.com/>