Fixing the code sections