Cleanup from analysis, refactor of string decorator and more unit / integration tests.