Refactoring after review
Merge branch 'master' into create/delete-table