Some minor code cleanup

using ns/using/IEnumerable/etc...