Make another cleanup and fix small issue