[~TASK] improved code, fixes #179