remove lyft-specific defaults
improve naming conventinos