Apply advices from Github comments.