Code (listing) clean up