Minor Changes across multiple files