Fixed ordering of @Override and method header comments in one file