Format Source and light Refactor