Minor code Changes