Fixed indentation and prettiness