Structure stuff a little nicer.