Code clean up
More clean up