Refactoring

Signed-off-by: Steven Magelowitz <steven.magelowitz@gmail.com>