Some refactoring to better names