Cleaned up and added missing file