cleaning up
minor changes