cleanings: formatting and imports
cleanings: removed unused method
SQL injection prevention