Began cleaning up instruction code