* changes after a comprehensive code review