Fixed several recommended changes by jvazquez-r7 and jlee-r7