Minor bugfix

Added the $return variable
Removed the static values