refactoring / ui niceties