removed the  keyword from some classes than do not require it