removed todo notes which were already implemented; Reformatted code