Refactoring

Signed-off-by: Phillipp Ohl <phillippohl@gmail.com>