Fix indentation and source formatting