doing some code cleanup for jay