Clean up, unification of naming convention, documentation.