Upgrading to 4.1 + better use of figaro gem