Updated code style
Removed raw exceptions, switched to format()
Removed raw exception, cleanup
Updated manifest
Fixed raw exceptions, format()
Cleanup