:sparkles: cleanup code