BIG REFACTOR: code style + remove launcher functionality