Application skeleton code cleanup and refactoring