Cleaned the code.
Rebuilt Contacts class.
Rebuilding Calculation class.