Removed the Kind and Guard structures

Less verbose code for use with node.js