Some clean up
More clean up