refactor + code style