Trying out some refactor ideas