improved attribute calculator
cleanup
cleanup