Added more commenting, removed unused files