Cleaned a bit; removed extraneous returns