Refactoring, split options by sections