Refactored and cleaned a little bit