Clean code and expand execute on attack