Cleaning and rebirth

Took development back up, cleaned and simplified.