(cleanup) minor cleanup throughout