Code refactoring

Small code style changes.