minor changes on source structur