0.0.7; Code simplifications