Code cleanup (gingerbread remix)