Indent fix and small rename