(Checkstyle done)(calculator added)