[fix] variable naming
[fix] minor code style issues