Litt refaktoring..
Some refactoring