minor code reuse fix + proper tabs