Merge ShadowNinjas review comments