code cleanup
minor changes