Code cleanup, reduce overall size