Added proper commenting