clean code after first office view done.