Merge "Made minor refactoring and lint improvements." into main