cleaned up some style issues (lint still complains about naming, but at least it's consistent)
cleaned up some style issues (lint still complains about naming, but at least it's consistent)

Cue/hop,Cue/hop