leihog cleaned up the source a bit