Renamed some variables and methods for better consistency with regards to the SQL command.