Refactor/Simplify; reorder code; resolve conflicts with messages/options
Resolve conflicts with messages/options