Somewhat tidier code... yeah I need to pay attention to lint