Edits on C++!! and Java