refactoring + cleanup
Signed-off-by:jonathanlermitage <jonathan.lermitage@gmail.com>