Cleaned up code A LOT

Such spaghetti before
Much clean now
Very amaze