Faster code

Code made faster by stripping down uncessessary parts