Improved method names and documentation.
Organized imports.