cleanup a bit
Merge branch 'design' of github.com:fairnopoly/fairnopoly into design
merge