Updating the code to "today's standards"