Small chagned, clean up code