Design refactor, green