Refactor
Codeformatting