Fix indentation
More cleanup