Remove old comments
Group variables