Cleaned up code errors for compile