Fixed some lint and change master key prompt