Applied suggested modifications by Ale.