Minor code improvements of "app/"-folder.