Cleaned up code after previous pull