cleaned up the where clause