Cleaning source code. Tested.