Nicer code in some places..