Improve config syntax

Had to revert changes form #9 because it wasn't squashed. Same pull request again.