Began refactoring some recent posts