Code formatted, unused comments removed