Some renaming and added comments as per feedback