Cleaned up config loading even more

Signed-off-by: Ian Macalinao <ianmacalinao@gmail.com>