Ongong refactoring
Signed-off-by: Dave Bush <davebush@gmail.com>