Remove commented code
Indent when in case statement
Bring back bracket less method call in tests