Source Code Base and Sample Code Clean Up