Cleanup to make the code readable