Code clean up
Merge branch 'master' into sqlite_rename