Clean the code a bit
Bump version to 0.4