Adding comments, formatting, removing unused namespaces etc.