Minor refactoring  and Updated comments for classes