formattig
refactoring