Minor improvements and code refactoring