little tweaks
remove dependency