final,madigan6: Cleaning up my code - removing unused comments, commenting functions