The code was cleaned in some places.