Final step in refactoring.

Signed-off-by: Fenny Fatal <Fenny@FennyFatal.com>