Cleand up some things.
Cleand up some things.