[no-task]: minor design changes