better understandable code, little bug fix.