Refactor and performance changes
Renames, documentation, cleanup