small refactoring
lots of stuff.. No time to think about what stuff.