Fix bindings
Refactor - format
Update comment on modmask