Made stuff somewhat nicer ;)