Remove reference comment
Style changes
Persistent api instance