whitespace change and rename functions for wrapping