Third commit. Make a quick refactory.