Further refactored word wraps based on standards