Reformatting for easier cleanup.
working on updates and cleanup.