Change to Illuminate/Console
CS fixes