Initial cleanup :D