Code style and use of Application fixes