Merged: Source tidy up