Refactoring, specs and a bugfix for the new annotation parser

#27 introduced a new and welcomed behavior, but left some dead code and broken specs in the bundle. This should raise the code quality a little.

Additional, there was a small bug leading to additional indentation in the output window.