Cleared from redundant comments and renamed value