clean code
Clean existing files via FileSync
whitespace
Merge