Both two style could be removed with the above comment addressed.