Remove unneded scope
Remove unneded whitespace