Renamed variables to lower camel casing
Added validations against database
Merge remote-tracking branch 'origin/master'