Halfway Commit (Cleaning code)

For any revert needed, code is working here.