Date in release date + small refactor