build settings (-feature), minor refactoring