Refactoring done =)