Code cleanup @burtbeckwith