Updated comments, removed recursive/commented out code, overall cleaning.