(Some trivial code clean up...)