Code refactoring
Code refactoring

More code convention enforcing.