Cleaned stuff up in calculator