Code duplication removed from wallmost