Code cleaning - Mr. B