Added deprecated tag to blocks
Fixed some code style issue