Made minor changes after initial commit