reformating some stuff for use without redis, comments and stuff