apps code style fixes