Fix indentation and pattern match naming