More callback hell cleanup