Clean

Clean source code & update logic