Huge changes to my own style