Cleanup & update, thanks to Temasek and Christer12