Refactoring. Coding style polishing.