#56 Code clean up