Cleaned INSERT and UPDATE queries