Cleanup, fixed lingering inline bugs