issues fix + indent fix