Some correction / cleans commit.