Debug, OCD, cleanup