refactoring

Signed-off-by: Daniel Dahlkvist (home) <messer_@hotmail.com>