Small refactoring - cosmetics