Merge private constructor into public one
Insure that blockSelectionEntity isn't null
Reformat all files.