Refactor: moved functionality to Config and PlayerControl classes