Tweak a little to make code and app look better