refactor (mainly formating)