Small refactoring session
Further refactoring