refacotring + autoformat