Nicer code structure