refactoring to expressions