minor refactoring

Signed-off-by: Tokenizer <fuad.efendi@tokenizer.ca>