remove save predicate
reformat module and imports