starting to clean up this file a bit.