Finished rework

Signed-off-by: Ritchie Flick <ritchie.p.flick@gmail.com>
Small Improvements

Signed-off-by: Ritchie Flick <ritchie.p.flick@gmail.com>