Doc added && cleanup