fixed code organization on makemake.py