last minute refact