Fixed formatting and variable declaration on abscence of comment field