move trunk to 2.4.0-SNAPSHOT
bit of source code sanitization