fix concatenation
fix idendation