Remove unnecessary comments and format