Cleaned repository. Added calc