* Added more SqlRestrictions
* Fixed several code style violations