improvin and simplifying django completion