cleaned-up a bit