Re: [AppDB] - make variables more consistent, fix indenting