[CLEANUP]: more code style reviewing