BlockGlass + code cleanup