Major code refactor and cleanup
Merge pull request #1 from stefanovalle/mauro_crud

Major code refactor and cleanup