Code style: Cosmetic changes
App: Restructoring DB conception