Cleaned up code in top level files in preparation for menu change.