Cleaned up the placement of the walls