refactor systematics handling
clean
clean up