Documentation / Code cleanup