Bug Fixes

+ Double check for spaces before variable handling
+ Remove print statement