Made the methods more succinct