added rent moduler and cleanedup