Code cleanup, sample configuration