deleted comments and using mixin for calc #41