Cleaned up some code and added Wall class