Slight performance increase and clean-up - 0.1.7