calculator module cleanup, closes #600