refactored again! removed a lot of shit xD