Fix indentation & Add default history