Post Edit
Reorganize code