Standarize names
Add some documentation