Minor style improvements and experiments (some commented code)