cleaned up some block definitions