Refactor and clean up

Signed-off-by: Ozan Turgut <ozanturgut@gmail.com>
Jasmine integration

Signed-off-by: Ozan Turgut <ozanturgut@gmail.com>