formatting, missing code duplicate remove