style fixes
fixed 2 open to-dos from Ram