Refactoring! Also, updated grammar