Put back final new lines + fixed indentation