Cleaned the wall class a little bit but more can be done