Minor formatting changes and bug-fixes.

Fixed importing issue, and made some minor formatting changes.