did some cleanup, removed unnecessary comments etc.