refactoring

@akuv @sanseveria