Development

A little clean up of things.