Rewrote everthing

the code is prettier now :3