minor unimportant refactorings