[DEV] beautify