minor style changes and breaking ;)