Cleaned up some block setup code