Tidy up + redis added