Updated comments

Updated the comments, used interfaces more uniformly