Add challenge & cleaned up