Code clean up on aisle 5

pattern class code clean up