Some Cleanup
Beginning Sun