Update Language And Refactor Spacing