Adding error handling, re-arranging methods