fixed previous check-in
fixed style errors