structured everything a bit more