Few code cleanups.