MB: Cleaned up lists