refactor: beautify code