Which of these is correct (the commented out versions or the ones above).