Some clean & refresh. Small commit.