code tidy-up

Signed-off-by: semteacher <semteacher@gmail.com>