Few more cleanups
Auto-formatting clenaup from appcode