...optimize some stuff