Minor changes of comments, variable names etc.