Improved: Updated the code for consitency.