Added appropriate commenting