Removed unused commented code. Added usefull defaults