Cleaned up for #20