Use Option syntax to transform option to Maybe
Move macros to their own package
Move laws to their own package