Reduced steps to hacking; took out fun; cleanup