Some very slight visual fixes and refactoring