small tweaks
combined our code