Just fix small structure bug and clean up.