Refactor to improve readability
Fix #26—Preserve status bar style when presenting