Refactured a bit