Cleaned up templated instructions