Welcome to the boards!

Both of those look good to me, but I'd wait for someone that knows more than me to find this thread.