Refactor: improve perf & readability
style: code cleanup