Fix up coding a little