minor cleanup bits during code read