Fixing indentation, removing the enclosing function
Making optional the use of new