Fixed code surroundings