Removing hard coded Strings & Adding JSDoc