Reformating Entries as per Issue #2