Got rid of some unnecessary variables and warnings about multi-line comments