code cleanup on obanyc-2060