Cleaned up code that I am checking against.