Cleaner -- Changed private API.

Renamed internal API methods. Updated doc string.
Improved imports.