Fix for variable docs
Code cleanup