Code cleanup... nothing special