Code cleanup
minor tweaks