Refactor more