Upgrade code style, annotation loading and error handling
Upgrade code style, annotation loading and error handling