Remove trailling whitespaces
Cleanup code a bit
Bump to version 1.6.0
Update packages versions for composer and composer