Some code improvements
Minor code adjustments
Minor code adjustments