Code cleanup, added on texture for later.