minor visual refactorings