Refactor of theorems in progress