GUI-427,
minor cleanup