reorganize code

sedikit merapikan code