Fixed main body

Fixing scope issues in class_eval