Removed another redundant function and made the code more readable