quick updates and refactoring