tons of styling
done with reviews and comments
merge max's changes