Clean code, update package