Clean
Working on converting end