Feature/fix remarks from review

LOVE THAT ! One more thing i'll check now for all reviews, thanks a lot :p