pretty-fied some classes