Clean up, documentation, renaming ...