Added comments / Refactoring