Minor code cleanup, added gaps