Add basic calculation and comparation
Remove useless code