Lowercase variables and added default values