Refactor

Keep code clean and nice!