more refactoring of puma wall controller