Improvements and code refactoring.