making code more semantic, minor style fixes
minor style fixes