Fix #2, cleanup