Some refactoring

Signed-off-by: Martinas Mihaela <martinas.mihaela21@gmail.com>