Whitespace in sample app
Taking code that doesn't need to be in a macro, out of the macro