#136 fix and cleanup