More comments, refactoring, renaming etc...