Cleaning up formatting from pull request

Adding @dynamic for lock property