Fix indentation + usage of dict