Code cleaning up for article