+ more pretty styles; refactoring