Refactor to be consistent with other launchers.

This is done in order to make them similar and them merge as much as
code as possible.