Refactor from around

Oh hey @ednapiranha, does this README work for you?