Needed to be more cleaner