Code cleanup, not as dirty now