Finished up cleanup.  Moving onto testing