Code blocks fixed