Tidy up
Support of Pi-LITEr