Code refactored
Changed call/ret macros
Changed the implementation of floor