Cleaning things up adding more whitespace