Reorganized code and added underscore