code cleanup
better install process