Made some changes all over

I made some minor changes in almost all classes.