Some smaller improvements
Unnecessary Method deleted