Having said all this, I am taking the return out anyway, because I think this is more in line with the general styling code used here...