Committed some minor changes