fix issues as seen on Codacy