Removed unneeded import lines and reformatted long lines.