Working on formatting code