Code is a little better