Reverted some changes for better readability