Fixed indentation errors and model dependency for now