Refactoring

I have done some clean up.  I hope you don't mind.

I have made the block callbacks in line blocks.  I have limited the number of init methods to a sensible level I think.