code changes after code review PP-session with Bryan