removing empty else statement
simplifying the sentinels
correcting the static calls
removing unnecessary parameters and code
removing the extra notification message that was causing a double save
merging the conditionals
eliminated a global
eliminating the unnecessary conditional