Refactor src
Fix command