renaming
add static mock + some styling