Added comments, small organization changes