Remove old fake geometry
Remove excessive code and give consistent style
Update comments
Specify detector group id