Made code more readible