Refactoring, corrected `fix`, deleted INLINEs