Reformating
Added More Information
Removed Dead Code
Removed some complexity where easielly possible