apply review notes from @Ragnis