Code pass clean up on ListMode and add in missing break statements.
Move Include class.