Inline more + regularise
Inline more + regularise