Feature/populate buyer and billing for current user

Line too long, `return` could be moved to the next line.