*Fixing issues identified in PR
*Cleanup, formatting, etc
*Changed to conform to new Vert.x core API