move calculation fn into class
remove unneeded formal arguments
remove unused formal arg