# 59 fixed + cleanup