Normalized it.
Continuing modifications to fork code