Code style corrections, preparing to add users app