Nitpicky clean up