various refactorings bringing inline with app direction; optimizations, etc

Signed-off-by: hoovejo <joe_hoover7@hotmail.com>