[Front-end] Code adjustment