Remove commented code and added a variable