Fixed indentation and other minor changes