incorporated review comments along with attr decorator