Added proper header comments