More clean up code