Made some calculations cleaner