Organize the methods a bit more cleanly