Cleaned up code and weird introduced characters