added installer, code cleanup
added installer, code cleanup