Cleaned up code in past moves