Fixed style bugs

Fix style bugs