Refactored some thing(s)