Make the launcher code conform to the coding standards and cleanup