Simplification and prepared statement
changes