cleanup
clean up
clean up
add calculator
simplifying weight
clean up
refactoring