Fixed syntax and code style