Some code simplifications

- Some code simplifications
- Set current version to 0.4-SNAPSHOT
- Remove author tags
- Some type fixes