Reorganize Code
no message