* undo a little nerfing
* improve style