reformatted code, remove old comment code