Fix missing references
Fix exception clause that was never called
coding style
Coding style
coding style
make method static
coding style
coding style
coding style
coding style