Small code tweaks to app