Continued work in Sqlite module
Minor code refactoring