+1 for making things cleaner :) Reading that code makes my head spin..