remove ;
hide variables in TimeStep and add comparison operators