fix an inline declaration; some cleanup