#73 code clean up