Small renaming and comments added