Refactored a little bit of the code