Made calculators consistant, and added some javadoc