Update class to remove extra functions, remove function calls, padd numbers properly and fight with Math.ceil