Refactor

some minor improvements
:+1: