Code consolidation w/ "$field" method + cleanups.