Made methods more clear