Clean Up

Integrated some ideas from sailsjs into project