Clean up indentation/syntax